From: Kenichi Handa <handa@m17n.org>
Date: Mon, 4 Oct 2010 01:53:48 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~16^2~42
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bfa33551a2a24afbfa337d435c7726b5509417ab;p=emacs.git

merge emacs-23
---

bfa33551a2a24afbfa337d435c7726b5509417ab
diff --cc src/ChangeLog
index 02f8d436c76,120e3dd1cb2..3f9bd8d2f20
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
 +2010-10-04  Kenichi Handa  <handa@m17n.org>
 +
 +	* coding.c (complement_process_encoding_system): Fix previous
 +	change.
 +
+ 2010-10-03  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* dbusbind.c (syms_of_dbusbind): Move putenv call ...
+ 	(Fdbus_init_bus): ... here.  (Bug#7113)
+ 
+ 2010-10-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* buffer.c (before-change-functions, after-change-functions):
+ 	Three-year overdue doc fix following 2007-08-13 change.
+ 
  2010-10-02  Kenichi Handa  <handa@m17n.org>
  
  	* coding.c (coding_inherit_eol_type): If parent doesn't specify